From 2fc34dbae55bff48abbf229a604ee98e5cd919f3 Mon Sep 17 00:00:00 2001 From: "djm@kirby.fc.hp.com" Date: Wed, 23 Nov 2005 15:23:28 -0600 Subject: [PATCH] Adapt to removal of #ifdef ia64 in xmalloc (handle SMP_CACHE_SHIFT) --- xen/include/asm-ia64/{linux => linux-xen}/asm/cache.h | 5 +++++ 1 file changed, 5 insertions(+) rename xen/include/asm-ia64/{linux => linux-xen}/asm/cache.h (87%) diff --git a/xen/include/asm-ia64/linux/asm/cache.h b/xen/include/asm-ia64/linux-xen/asm/cache.h similarity index 87% rename from xen/include/asm-ia64/linux/asm/cache.h rename to xen/include/asm-ia64/linux-xen/asm/cache.h index 666d8f175c..7d4cfd5682 100644 --- a/xen/include/asm-ia64/linux/asm/cache.h +++ b/xen/include/asm-ia64/linux-xen/asm/cache.h @@ -14,6 +14,10 @@ #define L1_CACHE_SHIFT_MAX 7 /* largest L1 which this arch supports */ +#ifdef XEN +# define SMP_CACHE_SHIFT L1_CACHE_SHIFT +# define SMP_CACHE_BYTES L1_CACHE_BYTES +#else #ifdef CONFIG_SMP # define SMP_CACHE_SHIFT L1_CACHE_SHIFT # define SMP_CACHE_BYTES L1_CACHE_BYTES @@ -26,5 +30,6 @@ # define SMP_CACHE_SHIFT 3 # define SMP_CACHE_BYTES (1 << 3) #endif +#endif #endif /* _ASM_IA64_CACHE_H */ -- 2.30.2